Revert "Introduce API to get the preferred visual"

This reverts commit 2b95d1a34ed7cd70ea3eaaa9b7d8add200b5a9d2.

Conflicts:
	gdk/gdkscreen.c

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index f3a35e5b77f3a803f2a58b854c5ba40d91acd799..d23183a3dd62ad24e4c5b55d7843d9783a56bd5b 100644 (file)
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -195,7 +195,6 @@ GdkScreen
 gdk_screen_get_default
 gdk_screen_get_system_visual
 gdk_screen_get_rgba_visual
-gdk_screen_get_preferred_visual
 gdk_screen_is_composited
 gdk_screen_get_root_window
 gdk_screen_get_display

diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
index c7d2d9bc9a18aa5da1369a90864a67db69b45c05..8065e194e81f2ad8a79f48bd409ccb2c01b7ac7f 100644 (file)
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -478,15 +478,6 @@ nevertheless.
   </para>
 </formalpara>
 
-<formalpara>
-  <title><envar>GDK_RGBA</envar></title>
-
-  <para>
-    Since 3.12, this environment variable can be used to prevent
-    using RGBA visuals on the X11 backend by setting GDK_RGBA=0.
-  </para>
-</formalpara>
-
 <formalpara>
   <title><envar>XDG_DATA_HOME</envar>, <envar>XDG_DATA_DIRS</envar></title>
 

diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index fef85cd9072b4733587146b30c1cf7289b72494e..d6ea6ca529d22c53143e147d81eca8f33638e21c 100644 (file)
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -912,36 +912,6 @@ gdk_screen_get_rgba_visual (GdkScreen *screen)
   return GDK_SCREEN_GET_CLASS (screen)->get_rgba_visual (screen);
 }
 
-/**
- * gdk_screen_get_preferred_visual:
- * @screen: a #GdkScreen
- *
- * Returns the visual that is preferred when creating windows.
- *
- * This will be the visual returned by gdk_screen_get_rgba_visual()
- * unless that is not available, or unless the environment
- * variable `GDK_RGBA` is set to `0`.
- *
- * Return value: (transfer none): the preferred visual to use
- *     for windows
- *
- * Since: 3.12
- */
-GdkVisual *
-gdk_screen_get_preferred_visual (GdkScreen *screen)
-{
-  GdkVisual *visual;
-
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  visual = gdk_screen_get_rgba_visual (screen);
-
-  if (visual == NULL || g_strcmp0 (g_getenv ("GDK_RGBA"), "0") == 0)
-    visual = gdk_screen_get_system_visual (screen);
-
-  return visual;
-}
-
 /**
  * gdk_screen_is_composited:
  * @screen: a #GdkScreen

diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index 57d613245bf983e75b16160d1c40998e601f7da5..dde5524fa46f4c7254c253b3f0adbd2c8b9fd60c 100644 (file)
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -45,8 +45,6 @@ GDK_AVAILABLE_IN_ALL
 GdkVisual *  gdk_screen_get_system_visual     (GdkScreen   *screen);
 GDK_AVAILABLE_IN_ALL
 GdkVisual *  gdk_screen_get_rgba_visual       (GdkScreen   *screen);
-GDK_AVAILABLE_IN_3_12
-GdkVisual *  gdk_screen_get_preferred_visual  (GdkScreen   *screen);
 GDK_AVAILABLE_IN_ALL
 gboolean     gdk_screen_is_composited         (GdkScreen   *screen);
 

diff --git a/gdk/gdkscreenprivate.h b/gdk/gdkscreenprivate.h
index b73a0926f04ceb07650bd28ccdf2d25bf595fe22..23cf1bdae25fe2a77b90263d7b5c819cb5db59b3 100644 (file)
--- a/gdk/gdkscreenprivate.h
+++ b/gdk/gdkscreenprivate.h
@@ -66,7 +66,6 @@ struct _GdkScreenClass
   GList *      (* list_visuals)          (GdkScreen *screen);
   GdkVisual *  (* get_system_visual)     (GdkScreen *screen);
   GdkVisual *  (* get_rgba_visual)       (GdkScreen *screen);
-  GdkVisual *  (* get_preferred_visual)  (GdkScreen *screen);
   gboolean     (* is_composited)         (GdkScreen *screen);
   gchar *      (* make_display_name)     (GdkScreen *screen);
   GdkWindow *  (* get_active_window)     (GdkScreen *screen);

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 03878669de8581bb64be0a42bb128e1947d3b566..a5844b5c796eff6aaebaa76673e0ff38eb943c34 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -10880,14 +10880,9 @@ gtk_widget_get_visual (GtkWidget *widget)
           g_warning ("Ignoring visual set on widget `%s' that is not on the correct screen.",
                      gtk_widget_get_name (widget));
         }
+    }
 
-  visual = gdk_screen_get_rgba_visual (screen);
-
-  if (visual == NULL ||
-      g_strcmp0 (g_getenv ("GDK_RGBA"), "0") != 0)
-    visual = gdk_screen_get_system_visual (screen);
-
-  return visual;
+  return gdk_screen_get_system_visual (screen);
 }
 
 /**